Merge from emacs-24; up to r107969
authorChong Yidong <cyd@gnu.org>
Sat, 5 May 2012 04:35:47 +0000 (12:35 +0800)
committerChong Yidong <cyd@gnu.org>
Sat, 5 May 2012 04:35:47 +0000 (12:35 +0800)

Trivial merge